Use faster new G_VALUE_COLLECT_INIT variant instead G_VALUE_COLLECT

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=641621

diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index 56cb0a396cee01ffe54bb1c0cd8c538506531df1..3050ff578ba2e9d0d67d80523576f53eae1fd560 100644 (file)
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -2671,8 +2671,8 @@ gtk_cell_area_cell_set_valist (GtkCellArea        *area,
           break;
         }
 
-      g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
-      G_VALUE_COLLECT (&value, var_args, 0, &error);
+      G_VALUE_COLLECT_INIT (&value, G_PARAM_SPEC_VALUE_TYPE (pspec),
+                            var_args, 0, &error);
       if (error)
         {
           g_warning ("%s: %s", G_STRLOC, error);

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 18f046c589fb072e3902b0850a15c5cf3d4e4d77..ad389416ab1bbcab6915d941bef21310bee7014b 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1004,8 +1004,9 @@ gtk_container_child_set_valist (GtkContainer *container,
                      G_OBJECT_TYPE_NAME (container));
           break;
         }
-      g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
-      G_VALUE_COLLECT (&value, var_args, 0, &error);
+
+      G_VALUE_COLLECT_INIT (&value, G_PARAM_SPEC_VALUE_TYPE (pspec),
+                            var_args, 0, &error);
       if (error)
         {
           g_warning ("%s: %s", G_STRLOC, error);

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 2c576bbbbe34fadb6e60c5a477b2c677cac20266..1d39e8ee833d44e56c96c9f5c4ffa3bfb4e492e4 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -875,9 +875,9 @@ gtk_list_store_set_valist_internal (GtkListStore *list_store,
          g_warning ("%s: Invalid column number %d added to iter (remember to end your list of columns with a -1)", G_STRLOC, column);
          break;
        }
-      g_value_init (&value, priv->column_headers[column]);
 
-      G_VALUE_COLLECT (&value, var_args, 0, &error);
+      G_VALUE_COLLECT_INIT (&value, priv->column_headers[column],
+                            var_args, 0, &error);
       if (error)
        {
          g_warning ("%s: %s", G_STRLOC, error);

diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c
index f3a325dc460c47a9f70f6a383f85caabbec282cc..38ededc295ee0b5ceacf1c9c73223894bf8ee681 100644 (file)
--- a/gtk/gtkstyleproperties.c
+++ b/gtk/gtkstyleproperties.c
@@ -736,9 +736,8 @@ gtk_style_properties_set_valist (GtkStyleProperties *props,
       if (G_IS_VALUE (val))
         g_value_unset (val);
 
-      g_value_init (val, node->pspec->value_type);
-      G_VALUE_COLLECT (val, args, 0, &error);
-
+      G_VALUE_COLLECT_INIT (val, node->pspec->value_type,
+                            args, 0, &error);
       if (error)
         {
           g_warning ("Could not set style property \"%s\": %s", property_name, error);

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 29544d2fdaa1f9a44e0adaa9841bf061c3ba4883..a1a91c24ad3935c3be4516de3d2fa1dc4692ab3e 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -1041,9 +1041,9 @@ gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store,
          g_warning ("%s: Invalid column number %d added to iter (remember to end your list of columns with a -1)", G_STRLOC, column);
          break;
        }
-      g_value_init (&value, priv->column_headers[column]);
 
-      G_VALUE_COLLECT (&value, var_args, 0, &error);
+      G_VALUE_COLLECT_INIT (&value, priv->column_headers[column],
+                            var_args, 0, &error);
       if (error)
        {
          g_warning ("%s: %s", G_STRLOC, error);